Auto merge of #3644 - Keruspe:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 6 Feb 2017 18:45:36 +0000 (18:45 +0000)
committerbors <bors@rust-lang.org>
Mon, 6 Feb 2017 18:45:36 +0000 (18:45 +0000)
ensure libressl compatibility

It looks like master still isn't compatible with libressl.

With this patch it builds and runs fine and all tests pass here.


Trivial merge